Merge "Remove obsolete BOARD_BVB_ENABLE reference" into nyc-mr1-dev-plus-aosp
am: a7a4725ff4

Change-Id: If1483a1c226506917c7199099a873cb9ce16f857