Test: flash build and forrest Bug: 66903791 This reverts commit 20ad4b92. Change-Id: I2c0f22f2a7c04221ed7b1562e516be98d27c7a50