Merge "Don't create prebuilt SDK modules when building them from source" am: 5b724965f4
am: 7edaddd167

Change-Id: Ib5791f90499a40976d1fa4e888a23f45d8eeb712