Allow two images worth of alignment slop in protected heap
authorChris Forbes <chrisforbes@google.com>
Wed, 27 Jun 2018 02:08:56 +0000 (19:08 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jun 2018 02:08:56 +0000 (19:08 -0700)
am: 0fd6d1afa4

Change-Id: Icb9a902c9897ba043f7554be5b44483eaf06c44d


Trivial merge