(cherry picked from commit 3c645995ca)
3c645995ca
These changes resolve the inconsistency between gradle and scons targets by configuring the gradle buildtypes to match the scons targets.
(cherry picked from commit a2bf47de2b)
a2bf47de2b