Fixed merge conflicts in skflow
Fixed merge conflicts in skflow

googlecodelabs/tensorflow-style-transfer-android,googlecodelabs/tensorflow-style-transfer-android,googlecodelabs/tensorflow-style-transfer-android