Merge "Add ext libs to AOSP - they are part of the system" into nyc-dev