am cfe99e79: merge in master-release history after reset to...
am cfe99e79: merge in master-release history after reset to 102a072d
* commit 'cfe99e79':
frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
releax wait timeout on start of dumpstate service