Modifications necessary for AOSP build