Merge "Add new system APK locations." into lmp-dev