Merge "Convert sdk_library to use androidmk Dist" into rvc-dev am: b2ed9acc am: 0fd834e2 am: 4dad349e Change-Id: I5bee553b2740781b080b247213c92d76b235403e