Merge "Adding the AOSP header." into oc-dev