Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.

Change-Id: I48175666857ab0fb1519777bdb6f7f0b6b5cc599
related-to-bug: 3073955

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base