Fixed aapt warnings

Change-Id: Id98196b04a2bf8d19c5df16876d75a22f80a2883
Development: Add LockClock to Eclipse classpath

Change-Id: I16675b3df671386bbe0bd926779c1eae0e799b43
Some changes added to compile and run with Java 6 and Java 7.

  - characters no UTF-8

Change-Id: Id365f85cae4d3c39d32a81fec200cdefb0a97f43