Merge internal glue layer to AOSP at c28cfda. Update glue layer to remove dependencies on to-be-removed private framework APIs.