Merge commit '3c608236d3db06a09e58957ab2e0da29b0bc6b5e' into HEAD

Change-Id: I1da9335d26d418de026c25d59aa6ee43af6d602c
tree: 9b1e42693e974a391a565ebe757edd6217a060fd
  1. service-t/
  2. Android.mk