tree 9f4fd745d84edfe94d3d11d95bc5064d166f5259
parent 9abc47d24f48879a4c2e1dadb470cdce612fe86a
parent d458faeeacf84ec57e18da5daad1259caf0f5109
author Vishwath Mohan <vishwath@google.com> 1484877976 +0000
committer android-build-merger <android-build-merger@google.com> 1484877976 +0000

Merge "Hide CFI behind a global flag." am: 2d7fb30207 am: 3ca34aeb7e am: 7baefbc0d4
am: d458faeeac

Change-Id: I297ab011fb901d6069672d034e2d8b8483ca21cb