Merge "Restrict visibility into the sdkext package" am: 3ede866f2e am: 2b56e7f529 am: 35faf980c1

Change-Id: Iabca7e2ea078e1bae4faaaa97bb8aa351aeb3762