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

Change-Id: I21df7bf8c2067cb707b68649392b042b7c805644