Merge "Make file_contexts as "android:path" property" am: b8ec243b5f
am: aba4ae6692

Change-Id: I896402370325fb84e589925df4766b5f5d130e4b