Merge "Merge "Compile libhwui.so with 2MB section alignment." am: 919e8c1b...

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1685430

Change-Id: Id2ba8fe0e6a8ba35d7f099631f61534d0fbbf9cd