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

Change-Id: Ib7ebb261de2d7492f0a5d1bd7faef7210b3ffe12