Test: make & flash Bug: 66910813 Change-Id: Ided44139628b938372941bf9dc7812490dfdf396 (cherry picked from commit fe1c2f9e)