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