Merge "Revert "Support regenerating partition table with bpttool in sign_target_files_apks""