Merge "Revert "Check prebuilt sources during checkbuild"" am: 526ddfb172
am: 96fdb76947

Change-Id: I86cb42e00027103cf43709bcbd129d8682b0d3b2