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

Change-Id: I01daf30a865d16e29de80e39f61752b6931681ae