Changes made for proper AOSP build