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