This reverts commit d9e2216b. Reason for revert: Internal builds with flattened APEXes Bug: 123780484 Change-Id: I93746f7ba5d6016621a6ffcd27aa7bee4b175cc2 Test: N/A