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

Change-Id: I155e61d28b1c109fbe4c8a428a418987329ae2c4