Move android-4.3_r3.1 config options

Change-Id: I9c51a13236795c18903e001a4070b7e8959b7278