Merge "Add apex build rule for com.android.sdkext" am: 139a120487 am: 3b2c30fd30
am: 586b7c972c

Change-Id: I3ef50c8158fbd8350a15a59a3495bce8ec6138bf