Android 7.1.1 release 52
Fix #ifdef statement.
am: 8c3febd20f

* commit '8c3febd20f0cef00a5049f6962666b6c62093aa9':
  Fix #ifdef statement.

Change-Id: I3c31733ab3b14fd3093e56504de970e88b63fa46