Merge "Convert sdk_library to use androidmk Dist" into rvc-dev am: b2ed9acc am: 918bff86 am: 878f6bb1 Change-Id: Ief698a9a70267fca4d4b544e91332d6b3ee806cd