am bbf849b1: Merge "Add missing profiler options."
am bbf849b1: Merge "Add missing profiler options."

* commit 'bbf849b1c686c9e09c4d59574da70181a47ebb5d':
  Add missing profiler options.

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