This reverts commit 5f034afc81.
Reason for revert: We are facing compilation failures when making
a full sun Android build.
Change-Id: Iacbc3022889045357cb2cc0a68047732a80cbbd2
Signed-off-by: Bruce Levy <quic_blevy@quicinc.com>
Signed-off-by: Vivekanand Tryambake <quic_vtryamba@quicinc.com>