Merge "Make ext.jar only dependent on public SDK APIs"
am: c457d8c95a

Change-Id: I08a0d7dd3f4a9266618683c02f261ad9cad41ffd