This reverts commit 5e690a21. Test: make -j29 PRODUCT-sdk_phone_mips-sdk sdk_repo Change-Id: I5aff9d6792a50b6e8eaca396a189724b4043bc81 Merged-In: I5aff9d6792a50b6e8eaca396a189724b4043bc81 (cherry picked from commit af9c8f24)