[automerger skipped] Merge "[view compilation] Add separate compilation property" am: 9343b88b43 am: 84d59ddcf9
am: 9ff145b7f5 -s ours
am skip reason: change_id Ica79ec076714f76d6ae75d398a2f62d7dd85a6a6 with SHA1 9e7a5f6078 is in history

Change-Id: I6167f0e950a9e405f3eaa7a4dc42d57225321cc5