Merge tag 'android-4.3_r2.2' into jb43

Android 4.3 release 2.2
flo: Enable mounting of connected USB storage devices

Change-Id: Ib63613577a7eb7a326807bc0f7768459fe91a4a1
Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	fstab.flo
flo: Readd noauto_da_alloc to fix horrific I/O performance

Change-Id: I4d6aa9abc04d3a6f0ad7ea8b0c34d59834d59cbf
Mark internal storage as primary

Signed-off-by: Evan Anderson <evan1124@gmail.com>
Fix inheriting props.

This file is named flo-vendor.mk in vendor/asus.
Merge pull request #2 from winner00/patch-1

Fix inheriting props.