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

Change-Id: Ia289f915e800a194e08d6bba5784bd63249eae6c