(cherry picked from commit b6d3f473) Bug: 62286076 Test: built the sdk locally Change-Id: Ifb2a88e715b4bb2f1077aaed4fd724b3a13cbe2d Merged-In: Ifb2a88e715b4bb2f1077aaed4fd724b3a13cbe2d