Merge "[automerger skipped] Add searching path for app internal libraries am: 68f5276dbb am: c8721fe510 am: 7b70531ab2 am: ca25f1dc1c -s ours am: 0f32099e5b am: 9a0d3b3e02 am: 368d9c65d3" into rvc-qpr-dev-plus-aosp