Merge "Update prebuilt script to import framework stubs into a new format."
am: 305c060c2a

Change-Id: I5d9c4cb48cf422fe53886bff2e60268a1472e79d