Merge "Update to used EXTRA_TOTAL_SIZE..." into arc-apps
am: f02e4b1e63

Change-Id: I70c4aa91a95bbd52d71b643efe1b775945fa3e51