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

Change-Id: Icac0c14c062df32fff14f031cd23cd6b82fff9bf