Merge "Do not complain about unexpected lsdump files when building with prebuilt APEXes."