Manual merge of e4ccb864 from frameworks/base/tools to frameworks/tools

Change-Id: I4893e72caf3dfd68bd503fd8daeabc8550d770a2
1 file changed