AOSP Compatibility

More changes might be needed.

Signed-off-by: Alvin Francis <nivlafx@gmail.com>