aosp-stable: Several enhancements

No more three top level dirs to host different repo. Now they are merged
together so that the whole arch is same with plain aosp stable.
Update two patches
Minimize the usage of global variable
Format the backup file name