Merge "Merge "Compile libhwui.so with 2MB section alignment." am: 919e8c1b am: 2cf6388f am: 18b7ad49" into sc-dev