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