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

Change-Id: Ibbaaa6241345c1ffe4bba60fdcb559c3db423ce8