Merge "[automerger skipped] Update prebuilt_etc package name. am: 1f4f211d8d am: 8e2af2251f am: 71863ee86e -s ours" into rvc-qpr-dev-plus-aosp