Merge "Restrict visibility into the sdkext package"
am: 3ede866f2e

Change-Id: I81326a611a899935ae98b54be2260932e57e5f25