Rebase: Initial commit of CAF aosp-common/android-3.0