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

Change-Id: Ia709b009261c1b87f98b45a87a3e8ad965d4d28a