Merge "Merge "Regenerate build files with better json file for riscv64" am: fc77d0a038 am: 2c1c9b95c5 am: a4ef7072fc am: 809d8a3ed0 am: 108f7d1769"