default: Fork android_system_extras

Change-Id: I532c0adca3e35a37b8e6cfc2fe9c4d2701b37962
Merge "default: Fork android_system_extras" into android-4.3