[DO NOT MERGE] Fix Build Breakages Backporting sl4a

-Patch to back-port sl4a from internal to aosp master
 A number of API changes have been made that are not yet
 in AOSP. This is a roll-up patchset of all API back-ports.

Change-Id: If897966e39526423b59c3b19f12991ddb4605f93
8 files changed