Merge "Make ext libs a part of AOSP and mandatory" into nyc-dev