tree b1cbbfbd481bb0c8d31c55bd2315fec56eb37fcf
parent b61473ef9cedc31722ebf7a90d86c0f857634995
author Nathan Harold <nharold@google.com> 1455837866 -0800
committer Nathan Harold <nharold@google.com> 1456860828 -0800

[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