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

Change-Id: I4952ddacd81bb3fc78b72bc9fc845f962f11a060