Merge "Add per-file ownership to libs/androidfw/LocaleDataTables.cpp" am: 073b0dad72 am: 36fac337ad

Change-Id: Ia0b55f46f5b92ee72ac17f8c1a1c76a75ddc51a5