Merge "Code clean up."

diff --cc mca/filterfw/java/android/filterfw/core/GLEnvironment.java
Simple merge

diff --cc mca/filterfw/java/android/filterfw/core/GLFrame.java
Simple merge

diff --cc mca/filterfw/java/android/filterfw/core/NativeBuffer.java
Simple merge

diff --cc mca/filterfw/java/android/filterfw/core/NativeFrame.java
Simple merge

diff --cc mca/filterfw/java/android/filterfw/core/NativeProgram.java
Simple merge

diff --cc mca/filterfw/java/android/filterfw/core/ShaderProgram.java
Simple merge

diff --cc mca/filterfw/java/android/filterfw/core/VertexFrame.java
Simple merge