This breaks the Android builds This reverts commit 4e7333967d. Change-Id: I537c3a86d0bdce52ad8e3f42a1e8a7535199ea0a Signed-off-by: Sharif Inamdar <isharif@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1959910
4e7333967d