Note that this change also includes another (non-breaking) update from another of my changes from a month ago. I guess nobody has updated API on master in a very long time.. bug: 18027885 Change-Id: I1fb1bcdaac07131c3bc43b13ad21cacd12a2e7c8
The API files were generated by running "make showcommands update-system-api". Bug: 18960664 Change-Id: Ibb4756d98be3cbf67f6103f5d5d8ff060b3c34c9