Merge "Merge "Merge "Put atf prebuilt through layoutlib bytecode manipulation" into rvc-dev am: e836d36b4d am: f712290a7e" into rvc-d1-dev-plus-aosp am: c4c65ed947" into rvc-qpr-dev-plus-aosp am: 7e45cc6ce8

Change-Id: I591220963cb0d0334b2daba6f5d1816cce488d13