Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" am: 43c98c74fe
am: ef5d1cb3b4

Change-Id: Ia2f1b08cf63b6543be1e50786ba9090ffedc1431