am 9f242318: (-s ours) DO NOT MERGE ANYWHERE. Update prebuilts/sdk to MNC-DEV #2080332

* commit '9f242318c25e154c1e94823715dd93775b54e555':
  DO NOT MERGE ANYWHERE. Update prebuilts/sdk to MNC-DEV #2080332