tree 1487bb77cf6d7bba53474fb58434fb54e2567dc4
parent a69a357f17de0f792c8241b109cdb8f55df765dc
parent 005d9401daa64c94e990cf547fb2cbdf73d0dd3a
author Colin Cross <ccross@android.com> 1493337903 +0000
committer android-build-merger <android-build-merger@google.com> 1493337903 +0000

Work around reversed architecture specific includes am: adfc0a1a32 am: e5e4c49907 am: 1c444ad862
am: 005d9401da

Change-Id: I66c9354f7360def6a1225f77fc5a2748b13b7d09