Merge "Make file_contexts as "android:path" property"
am: be95803148

Change-Id: Iae2109abca2f835c2b343af93dbaa72e420a6851