Merge "Convert sdk_library to use androidmk Dist" into rvc-dev am: b2ed9acc am: 0fd834e2 am: 41ff6abe Change-Id: I10805b616cc3b13ea0c80f87cd8d51dd3a8c7f1b