Merge "Merge "Put atf prebuilt through layoutlib bytecode manipulation" into rvc-dev am: e836d36b4d am: 58b893d8d3 am: 598344fa9c" into rvc-qpr-dev-plus-aosp am: d20c378b7c am: 28017982eb

Change-Id: Id35b658850b5b3f79c4f316798b0bb45d20fb568