Merge "Add "nodpi" to DpiTest Android.mk"