Merge "Revert "Drop prebuilt files to android source tree."" into main