Merge "Add prebuilt_apis module" am: 7aac552542
am: 82f464a414

Change-Id: I5192ebfea1f47dd39e4de339c52e1fbae23874f0