Merge "Put atf prebuilt through layoutlib bytecode manipulation" into rvc-dev am: e836d36b4d

Change-Id: Ic13670ef04546c3ae49c192619f678560ee3ce14