AOSP Support

To allow aosp build