Revert "Revert "'layer*' which are returned object of adopt_unit have been substituted by 'unit*'.""
Revert "Revert "'layer*' which are returned object of adopt_unit have been substituted by 'unit*'.""

This reverts commit e2dee673f33734f50eee4d7b088c9267bb3ba1c0.

Katsuya-Ishiyama/image_style_transfer,Katsuya-Ishiyama/image_style_transfer