Merge "Adding the AOSP header." into oc-dev
am: 35dcb5f5bb

Change-Id: I89a4019f462958c8b87597b5bb3cc11e751fb476